Removed last defines..