general updates and removed static forms